Revision: bazaar--devo--1.1--patch-26
Archive: thelove@canonical.com
Creator: Canonical.com Patch Queue Manager <pqm@canonical.com>
Date: Fri Dec  3 17:55:24 GMT 2004
Standard-date: 2004-12-03 17:55:24 GMT
New-files: libarch/merge-three-way.c
    libarch/merge-three-way.h
Renamed-files: commands/cmd-lint.c commands/lint.c
    commands/cmd-lint.h commands/lint.h
Modified-files: commands/cmd-apply-changeset.c
    commands/cmd-apply-delta.c commands/cmd-delta.c
    commands/cmd-redo.c commands/cmd-replay.c
    commands/cmd-star-merge.c commands/cmd-undo.c
    commands/cmd-update.c commands/cmds.c
    commands/cmdutils.c commands/cmdutils.h commands/lint.c
    libarch/apply-changeset.c libarch/apply-changeset.h
    libarch/build-revision.c libarch/changeset-report.c
    libarch/changeset-utils.c libarch/changeset-utils.h
    libarch/commit.c libarch/libraries.c
    libarch/library-txn.c libarch/make-changeset.c
    libarch/patch-logs.c libarch/patch-logs.h
    libarch/replay.c libarch/star-merge.c
    libarch/star-merge.h libarch/undo.c
Modified-directories: {arch}/baz/baz--makearchivefixprint
    {arch}/baz/baz--makearchivefixprint/baz--makearchivefixprint--1.1
    {arch}/baz/baz--makearchivefixprint/baz--makearchivefixprint--1.1/jblack@gnuarch.org--2004
    {arch}/baz/baz--makearchivefixprint/baz--makearchivefixprint--1.1/jblack@gnuarch.org--2004/patch-log
New-patches: aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--base-0
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-1
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-2
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-3
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-4
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-5
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-6
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-7
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-8
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-9
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-10
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-11
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-12
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-13
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-14
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-15
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-16
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-17
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-18
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-19
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-20
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-21
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-22
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-23
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-15
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-16
    thelove@canonical.com/bazaar--devo--1.1--patch-26
Summary: merge in aaron.bentley@utoronto.ca--baz/bazaar--three-way--0
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--base-0

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-1
   Ensured that tree versions for libraries are always right

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-2
   Added tree_latest_revision to patch-logs

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-3
   Moved star-merge -t to use the new arch_merge3

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-4
   Made interpret_delta_path into a cmdutils function

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-5
   Removed the useless --forward option from all relevent commands

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-6
   Added --three-way option to apply-delta

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-7
   removed references to star-merge from merge-three-way

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-8
   questionable changes to pull merge_from_changeset into merge-three-way

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-9
   Undid questionable changes

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-10
   split apply_changeset into apply_changeset and merge_from_changeset

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-11
   Fixed missing includes and unused functions

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-12
   Removed unused variable

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-13
   Refactored merge_from_changeset

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-14
   switched callbacks to one_path_callback and two_path_callback

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-15
   Output tweaks

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-16
   ~ -> =, show delete failures

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-17
   More incremental chatter

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-18
   Parameterized whether no-op merges are displayed

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-19
   Fixed spelling of "arch_nearest_star_ancester"

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-20
   Added no-op message for missing removed directories

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-21
   Delayed the no-op detection

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-22
   Fixed sort order for directory removal

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-23
   Replay --skip-present of bazaar--devo--1.1

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-15
   merge in aaron.bentley@utoronto.ca--baz/bazaar--three-way--0

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-16
   merge from thelove

